From: Jure Kajzer <freakolowsky@users.mediawiki.org>
Date: Fri, 15 Apr 2011 11:19:13 +0000 (+0000)
Subject: * added E_DEPRECATED into wfSupressWarnings
X-Git-Tag: 1.31.0-rc.0~30823
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=dfe31bfd2747aacef82351a5b1605054a1028334;p=lhc%2Fweb%2Fwiklou.git

* added E_DEPRECATED into wfSupressWarnings

merge into 1.17 if required PHP version will be 5.3+
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 3053553074..0437bd5735 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1777,7 +1777,7 @@ function wfSuppressWarnings( $end = false ) {
 		}
 	} else {
 		if ( !$suppressCount ) {
-			$originalLevel = error_reporting( E_ALL & ~( E_WARNING | E_NOTICE | E_USER_WARNING | E_USER_NOTICE ) );
+			$originalLevel = error_reporting( E_ALL & ~( E_WARNING | E_NOTICE | E_USER_WARNING | E_USER_NOTICE | E_DEPRECATED ) );
 		}
 		++$suppressCount;
 	}